Merge "Update boot image profile" into qt-dev
am: 0409420da8

Change-Id: I616082bdd01d3a538f47ea1e446dd8b03bf71725