am 4aef1795: Merge "Fix TreeMapTest & TreeMapExtendTest."

* commit '4aef179500ac92cf5317b0c9575d1ebf7e39119c':
  Fix TreeMapTest & TreeMapExtendTest.