Merge "Rename sanitizeLocationInfo as we make it System API."