Merge "Allow AOSP to boot."