DO NOT MERGE - Remove deprecated image defines
am: c73b811066

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