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

Change-Id: Ief08752efe3670d39f54f27e26966cf06ef8cf4a