Merge \\"Fix race condition updating local map data.\\" am: 863d8e11b9
am: e1eb2272d6

Change-Id: Ic7553354081f2bc2f578b30db9719ce7a6acc255