am d7baaed8: Merge "Allow AOSP to boot."

* commit 'd7baaed89e498ad3cf7d9c487d6cae967e562ea4':
  Allow AOSP to boot.