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

Change-Id: I1f5d3c36c0b07f61de61a5e2eba679fcd2864a16