Merge "Fix b/20638271: (Part 1)" into ub-camera-haleakala