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

Change-Id: I6795fe57078b679ef4077c751458603124d848e7