reconcile with open-source gingerbread

Change-Id: I11029c58c7bcfa194dde5584ea1e3ba048fb817b