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

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