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

Change-Id: Id3c0b44a7566a9c5989195e308fb79a7a55fe21d