DO NOT MERGE - Remove deprecated image defines am: c73b811066 am: 87ca2397c4  -s ours am: 1e258cd044 am: 865145f085  -s ours am: 68976ead50 am: b8cd2a261a am: 7ecec2f57c  -s ours
am: 9094b23ca6

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