[automerger skipped] Use the apex image when the device config asks for it. am: 0ebdd343 -s ours
am: ac435540 -s ours
am skip reason: change_id Id2fff6a4569d48b8e6a886cb82bdba205b0dd56a with SHA1 25c0e035 is in history
Change-Id: I6f038c404e93a8a67d87fc2df2a95da2b3e9483c