Merge "[ML13] Fix the locale passing in ProximityInfo"