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

Change-Id: I2daefb02101725a180cd11811ba0aee9b94da1e3