Merge "CameraServiceProxy: Cleanups and receive more information from CameraService" into oc-dr1-dev