Reconcile with gingerbread-release

Change-Id: I31accda200f9a95127e977ecefaa92090e37709d