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

Change-Id: Iae7a48edbab01e6fe504049c6ed139eb58cd1bb9