Merge "Remove unused NTP servers from gps.conf" into jb-mr1-dev