sync kumquat

Change-Id: I70f056dda93735a8324b074e8863d2aa9e6bf7d7