Reconcile with open-source gingerbread

Change-Id: I3b54cd3a119876b17734aefa8411b69e09934fa3