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

Change-Id: I1b2655165d7496572f6f97747f02d125b451fa07