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

Change-Id: Ia5343e7e742c844a0b58d3964ec0eac2c3d0b75a