Merge "Fix GPS provider thread blocked by NTP and XTRA" into jb-mr1-dev