Reconcile with gingerbread-release

Change-Id: I5c53acce972848ec4adb67782e9e741b3555654b