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

Change-Id: I75b9e9d20675e95f943810765ee103b40e923316