Merge "Move to using boot image profile" am: a5e21a0481
am: aa34eb5265

Change-Id: Ided6a262f04dce1836c1ffb6889f1587e0602009