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

Change-Id: I989598cac13602a7448f2c061bb0fd4d4ab7f81c