Merge "Call deleteAidingData to clean up after injectBestLocation"