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

Change-Id: Ieb088a21a145e1b426b144ad6d44b6c610aebd9c