Merge "Cherry-pick: Switch from ICU deprecated unorm_normalize to unorm2_normalize." am: 776a18aff2
am: 23040ff2d2

Change-Id: Iac43a41d19078ea6f11fd41133259d73a60763cf