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

Change-Id: I892b86fc36cf4e60dbfa7b00b383cb93c5a85d13