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

Change-Id: I8c4714b9944249651a67fc5ba9b65108be144887