Merge "Replace usages of ShortNumberUtil with ShortNumberInfo"
am: 8405e5cd3b

* commit '8405e5cd3b3b2491b5f487cbe26d9e1550e55370':
  Replace usages of ShortNumberUtil with ShortNumberInfo