reconcile with open-source gingerbread

Change-Id: I2c27148958dbc2c47121d4874e1108389da804c0