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

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