Merge "Camera: reset callback after test done" into oc-dev
am: 72ff9a1e38  -s ours

Change-Id: I4cf59eaf2e9583af574d50f9ddb830eb34e3356d