Merge "Fix location parsing accuracy" into oreo-cts-dev