Merge "Free unneeded obsolete maps" am: 80060f25cb am: 73c1980600
am: aec862c1ee

Change-Id: Iacbf33642feaea95269b57b388e3d16784b6a2eb