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

Change-Id: Idb00177817ea267435bd52a08baba8ee66bc8a17