Merge "CameraService: Clean up ICameraServiceProxy; send it more info" into oc-dr1-dev