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

Change-Id: I131dc09559d0d67a19ee99f390647816dedf4943