Merge "Merge "Fix location parsing accuracy" into oreo-cts-dev am: c84bc64c19" into oreo-mr1-cts-dev am: 1111e06ee7
am: 435a0f5d08

Change-Id: Ie4feb92fe85d19d2c60f3316f4afaca25d4e885a