Merge "Fix LocalUpdatableMaps"
am: 1d1da49127

Change-Id: Ic05649d7c1878c102334f75d8cd9ab9751a17ebd