Merge "Merge "Fix location parsing accuracy" into oreo-cts-dev am: c84bc64c19" into oreo-mr1-cts-dev