am 26cc1d68: am b6e88020: Merge "fix unittests."

* commit '26cc1d6838c0c4fd18abbf6ea5a38d24aea93893':
  fix unittests.