Merge "Fix boot_profile_jars.zip"