micro-commit for kao

Change-Id: Ib7e3c0c7fc59f6f35e2aa1944482162231a77b2b