Merge "Fix LocalUpdatableMaps" am: 1d1da49127
am: f1cbe1e065

Change-Id: I54801ff90c49f89d74013d5e81e26cc0ebff5aaf