Reconcile with gingerbread-release

Change-Id: I04ace1c344bedc2525a6c1eb8abe78b2f42d08a6