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

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