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

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