Reconcile with gingerbread-release

Change-Id: Iaef69ddb901f908564167a085c93e91298ce61d4