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

Change-Id: I0860c4dfaf348c4e44696e7ff3b0717c9f99797b