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

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