Merge "Free unneeded obsolete maps" into oc-dev am: 3364fbc6b0
am: 6e3343a308

Change-Id: I6db52cfd6cb07762c6136ad37a0a83e3ec8a5f12