Merge "Remove the deleted stats from map" into pi-dev