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

Change-Id: I0b5c8a6c1a3816b013f8962ec5bcc5433f28f9e2