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 am: 2b2e7fc957 am: f23f074ed6 am: 1c2e80f9c4 am: 3be84b4e0f
am: e13c879d55  -s ours

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