Merge "Reconcile differences between boot image profiles."