Merge "Fix dangling pointer issue in LocalUpdatbleMaps" am: 8f9d4afa2d

Change-Id: Ie360794beb52da29afa3cce5c181ec439c23e981