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

* commit '865145f0857037c72267fc515e7b03002f60fd9f':
  DO NOT MERGE - Remove deprecated image defines