Reconcile with gingerbread-release

Change-Id: I9ae917b71743cddf46bf22cd1255a7321c0ed467