Reconcile with gingerbread-release

Change-Id: Ic4aca5ef26cbfb97281582ddb6bfe290f60c29fc