Reconcile with gingerbread-release

Change-Id: I5bc27e555476e88e41de368a8883ca9b4ce5805e