Merge "Merge "Fix normalize doesn't work on carrier template" into sc-qpr1-dev am: ae28e400" into sc-v2-dev