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

Change-Id: I33784b0f9c681dcfdc2a1f03d707336a9729ae30