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

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