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

Change-Id: I71cda9d0ad979f9bfc884cf963d117cb8e0057f3