Merge "Add mechanism for device-specific loop images"