DO NOT MERGE: Backport 2017c icu test changes
am: 8b48ba7a2d  -s ours

Change-Id: If8d671cc790d0fe07e8a480760651871db63c305