Merge "gps.utils changes"