Reconcile with gingerbread-release

Change-Id: I59891e1337ca9449a4ed3a3caf5e488f9e91dcad