Merge "Disable tests failing with ICU62"
am: cc11cf2ef2

Change-Id: I64229a24eb0c20a81d8c548504d9a97de457c074