Merge "Use KB instead of kB." into oc-dev am: e8165eb4ba
am: 2444e42e1c

Change-Id: Ic43b71522c28cdd2e7c73e7406f972b623bc4d54