Merge "DO NOT MERGE - Remove deprecated image defines" into lmp-dev
am: 3990c54224

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