Merge "Pass down apex image if profilebootimage is enabled" am: 5f8d418980 am: 38b912fe51 am: 062f3899ac
am: 7c03e6da83

Change-Id: Ieca6a45662447a6b4a2569aa57c70cccd635f12c