Merge "Revert "Add mechanism for device-specific loop images""