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

Change-Id: Iab18b4e433aa1de2bb4acde5db2e8b8ea5a56710