Cleanup

Change-Id: I3f7dda4caff1af498b60efd6ac47a273d06b0e36
Merge "Cleanup" into kk