Merge "Replace usages of ShortNumberUtil with ShortNumberInfo"