Cleanup

Change-Id: I9cd155e539897ca7fa0b3681e692d3166e6e0763
Merge "Cleanup" into kk