Merge "Move to using a profile for boot image" into oc-mr1-dev am: 4c1ad8fce4
am: b75b5b10b6

Change-Id: I4bcc321959070ad7d8dea242a11d83afeeb7fac6