Reconcile with gingerbread-release

Change-Id: I282605215ea6209cafa7a8b648b3608de992889c