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
am: 139471c411

* commit '139471c411bae15815a839e000ea4663643aae7c':
  DO NOT MERGE - Remove deprecated image defines