Reconcile with gingerbread-release

Change-Id: Idd382400f3db9808e7d3d532e67f84be11c493ab