[automerger skipped] Merge "Disable tests failing with ICU62" am: cc11cf2ef2 am: 886f1488ea
am: a1aedd2108  -s ours

Change-Id: Ia76b0a4266fcfa44f5d80e2154fcabf338e2a160