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

Change-Id: I968b0440697ab65a4004bc28025e31a7c7c6499b