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

Change-Id: I64e388601fd728d452153bdcb29533e3b5e1458d