reconcile with open-source gingerbread

Change-Id: I817f61141bf2c5189b13965ea9f3ead8f19d61cb