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

Change-Id: I9c24f764d2f94baa183b62c253799a605f22390c