Reconcile with gingerbread-release

Change-Id: I52a808eebd1d2ca2711fe13f92ffc71c5ff7ab0a