CameraWrapper: changes from CM

Change-Id: I9873750ac51ddc0844c543882bb385830e30e933