Merge "DO NOT MERGE Revert "Update camera2 API usage"" into ub-camera-glacier