Merge changes from topic "icu64"
am: 9125f33633

Change-Id: I8f6968ee92c3d027af4e1f52f8c21cc089502a7d