am e4a959ec: Merge "Consistently avoid displaying trailing zeroes" into mnc-dev

* commit 'e4a959ec862ff83a1ceb5904225fbe2d4248a9b8':
  Consistently avoid displaying trailing zeroes