Merge changes from topic "icu64" am: 9125f33633
am: 1327f2a84a

Change-Id: Iaf59aecc77db1d960663ac446a6edf6f8650b01f