Reconcile with gingerbread-release

Change-Id: I92e5fc579c30c9912f9b0523a7c7059ff8ddb636