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

* commit '68976ead50619b67c3ea819f2292ac0596a91448':
  DO NOT MERGE - Remove deprecated image defines