Merge "Add support for using profiles for boot images"