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

* commit '3ac87904eeb5f902a02da18d2994fe87ae97bf6c':
  Fix UnicodeBlockTest.