Merge "DO NOT MERGE - Remove deprecated image defines" into lmp-dev am: 3990c54224 am: c356b493c1  -s ours am: 8b8df3b2c4 am: 07d12fe91b
am: f8a626aacb  -s ours

* commit 'f8a626aacbe15f1a5e1e13e1d9d550ba7524443f':
  DO NOT MERGE - Remove deprecated image defines