Reconcile with gingerbread-release

Change-Id: I59ba28efeeac72712c237f8897007e22281f8087