Reconcile with gingerbread-release

Change-Id: I1b4ebc93955e3e929c8984e4e6b505d628061b68