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

Change-Id: I9eadb724b353f1df6c8654fedeb76dfcf22d4ed6