Merge "Loading the camera preview correctly with direct boot" into nyc-mr1-dev...
Merge "Loading the camera preview correctly with direct boot" into nyc-mr1-dev am: 10016505 am: c7c6e110
am: 6a34765b
Change-Id: I737399616f6b33491455e49f236473689a39ba47