Reconcile with gingerbread-release

Change-Id: I59e35b5788a1c7855a97bd4577d0c44f066c0bd1