Merge "Camera: reset callback after test done" into oc-dr1-dev am: eba1407b55
am: 6277952f30  -s ours

Change-Id: I321e1c2b8d79236055a97699408c6fb0dd99be45