Merge "Free unneeded obsolete maps"
am: 80060f25cb

Change-Id: Ifcab20156fef9b6036ed8c67f906d730e7a8abe1