Merge "Merge "Do not clear scores during stopTracking." into oc-dr1-dev am: 3b63aa79 am: 06a6d6bb" into oc-mr1-dev-plus-aosp