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

Change-Id: I802becdfbc27cfe8edf4d0dd5b6b54f8f46701ad