Merge "Disable tests failing with ICU62" am: cc11cf2ef2
am: 886f1488ea

Change-Id: I82ec86c5187639f8b3ac14d9fc4bd77aed1befb1