am 0ca2c68d: Merge "Unit test updates for ICU 51 patches"

* commit '0ca2c68d5fa6d65d6b9aa9100c33dac1987b8f6f':
  Unit test updates for ICU 51 patches