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 am: 9763d5d6cc am: 12699d9bd3
am: 60d61cd414

* commit '60d61cd414d0acc93d2f69b30b7f9799a8e43922':
  DO NOT MERGE - Remove deprecated image defines