Merge "Fix dangling pointer issue in LocalUpdatbleMaps" into rvc-dev am: 64021d834a

Change-Id: I23e337eb2b6705e07b2d93f3561285923544d4f0