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

Change-Id: Id2d4bb897eba64c9d448d1e4b023e0eb732fbc21