Reconcile with gingerbread-release

Change-Id: I500f9a10cdfb891919b1e5618a42330ba00fcfb6