New kds chnages

Change-Id: I9dedc0a349097668c4b932296adecd204bb41247