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

Change-Id: Ie01e3041511da15461b1aca94f541a37372374fc