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

Change-Id: I66135de97d98775972d50b74e8221d953763182e