am c2ec0af0: am f7892a21: Merge "Fix UnicodeBlockTest."

* commit 'c2ec0af034d1f432c38b3bf61b03ea8c266921d1':
  Fix UnicodeBlockTest.