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

Change-Id: I8443360ac0b86cca00f77ae0e90d96b9db043b03