Merge "Refine freeBuffer in Mapper 2.0"
am: 9b2431d02a

Change-Id: Ia35e361e2b8343b3ad6205f30b1571547e7bdb3f