Merge KK manifest

Change-Id: Ia3a63ed7d6aa1e4538f44db2248405a258eb5063