Protecting Icon normalization behind a feature flag

Change-Id: I91b7126765049372a3ffec3ad6f661715dc83bab
3 files changed