Merge "Do not clear scores during stopTracking." into oc-dr1-dev am: 3b63aa79eb
am: 34df6c0af3

Change-Id: I583ac138154f1fbb46c6ad536de7038b1847dda4