reconcile with open-source gingerbread

Change-Id: Ie2eaeb35f7816ade7928c20e5ff4193561a407f0