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

Change-Id: Ic78237f03036cb9919e23ccabbfcb9e4e4183e78