Merge "Move to using boot image profile"