Merge "Increasing GPS_LOCK default privacy level"