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

Change-Id: I1007702b75ad0e0065ee14691a2984afe688fbd5