Merge "Camera: reset callback after test done" into oc-mr1-dev
am: d17bb31a0d

Change-Id: Ib7a08d2f8a403dfffe6930a7761579fdb1fa39d4