Merge changes from topic "dup_icu4c" am: ce912aadda
am: 055708f26b

Change-Id: I6bfd325bae7e80b81bca66298079339af988a19e