Reconcile with gingerbread-release

Change-Id: I4b6c483135fc0cb50e6de6c2fde845842c29e25c