KitKat Blobs

Change-Id: I4cb0782fe4f95a6ff20351d2cc29220db4542d9a
Cleanup

Change-Id: I5072f23827b7ec6471d0ba0cb873506b81ceaf85
Merge branch 'cm' into HEAD