Merge "Add mechanism for device-specific loop images" am: d81bb36b5b
am: 5446037552

Change-Id: I5c3afdc9453e9c06fb7f6a51af2503905e83ac9f