Change patches to v2.0-kk branch

Change-Id: Ibbebef4accf07e77ad6af710460df0d2cab1c830