Merge "Remove unused parameter to OneCamera.close" into ub-camera-haleakala