Reconcile with gingerbread-release

Change-Id: I01d34fd2c90d381d4095b5217506a4d35034be53