Reconcile with gingerbread-release

Change-Id: I18a6000c9f2d2537e2447035a0f389aee6d52f1a