Reconcile with gingerbread-release

Change-Id: Ifd688fbee76fa395079e8a2386cec18f26868a7f