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

Change-Id: I872102c436f08b5d7cb06290ef45d20dfe10d78c