Merge changes from topic "icu63" am: f4ab8b61ec
am: 818c18d9b8

Change-Id: I2086101f32d62f657ebfabbb297a2bcccfca13d5