Reconcile with gingerbread-release

Change-Id: I7ecfd1052c530b417f300e91c7ee28d1920dce2b