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

Change-Id: Ie3bbd64c0ac7ce51893eb6c84c43932294e8af00