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

Change-Id: Ibe45154d4945ea47023c7d750e5d3c86db7f6c51