Merge "Remove support for image classes" am: 566bfcf475
am: e8131249e5

Change-Id: I52062c008a9b658471e4adfca8d5d116dd35790c