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

Change-Id: Id7da647c4b3a8e839826e56a0657e03fb3e91d31