Reconcile with gingerbread-release

Change-Id: I3cb3d915837ebe59c2d7007d71ef3a1f334e9b8b