Merge "Require IMAGE_NAME and HARDWARE_ID"