Merge "Check vendor_manifest_ for nullptr." am: 817d78e956 am: 2076da2a39
am: aaca9051a0

Change-Id: Ie4025dc94a308a670dc6a2448ae30e738a31e316