Merge "Revert "Use KB instead of kB."" into oc-dev