Merge changes from topic "icu63"
am: f4ab8b61ec

Change-Id: Ic084a6e5efd95ec3c82d78d74d8e155a00deff48