kk Vanilla build

Change-Id: I8c86be6d3cc96328854e38b47b50691fd64f8f40