Merge "Fix warning in config/boot-image-profile.txt" am: 81dc06e259
am: f22673adb8

Change-Id: Iade600bd31b2774119b0c6ac2ade77568262a102