Fix race condition updating local map data. am: 0c572d01af am: b0e63a69d2
am: e3cc4e5bb4

Change-Id: I28b5a56d4119b402e0008f56d0cb8087a407eee4