sync kumquat

Change-Id: Ib05bb0481bf31965a9891a0f24d7953d79610580