Merge "Revert "Use KB instead of kB."" into oc-dev am: e389f00d7f
am: 9682a0def7

Change-Id: I9bf509a7a0b05943e717bddfc85423553c3e615e