Reconcile with open-source Gingerbread

Change-Id: I58c4c749e260c6016574df4c5a4ad2c6499381b8