Reconcile with gingerbread-release

Change-Id: If7c568d850eaffbcfc237e8b875bc5684c6dc651