Reconcile with gingerbread-release

Change-Id: Ia9383258bc25f7a82628a1c7238140b810e2f3d3