Reconcile with gingerbread-release

Change-Id: Ib78aa2a68601dace481a67c2c310fe8f9d170c5c