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

Change-Id: I7bf4e3942252b59c9b346c449a1d5c87629456bf