Merge "Camera: fix various VTS issues" into oc-dr1-dev am: 5311547c05
am: fb5c49990f  -s ours

Change-Id: I60d8f629bc4a696e489eb226ab7686eb74dd059f