Fixed problem with Unit display for Unit that do not support SI prefix.

Change-Id: Ib6648704628bbe7ae5536f95444c104cd262fdf7
7 files changed