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

Change-Id: I1fdf7b10e9f09033479049adfb7128bcad7c127a