Fix kwargs bug.

Change-Id: I4f85d089fbab31e3d062f175c0cd3f49802e8b00