Merge changes from topic "dup_icu4c"
am: ce912aadda

Change-Id: Ied6cc731e1c57ab48340b5698c669933ed1ac7d7