Reconcile with gingerbread-release

Change-Id: I4ae4dcd4bff822e117178af2efd8527c90cd9d26