Merge changes from topic "icu65.1-upgrade"
am: ad2026640c

Change-Id: I46464bedb5a1fe913db0e5317ffba0eebeb00b5f