Reconcile with gingerbread-release

Change-Id: Ibdf7e62e8fd0d3c6991767adb55d96c5e1bd4e97