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
am: e88cc03449

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