Merge "Camera: Add support for testing partial results" into oc-dev
am: 98b7dd57dc  -s ours

Change-Id: I8301d4bb4ec160018865bab5109013809202af80