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

Change-Id: Idaf54e0b5a6ffc245ff140d650ad785e8adfd6e7