Merge "Fix warning in config/boot-image-profile.txt"