Merge "Fix boot image profile in make files" into oc-mr1-dev