Reconcile with gingerbread-release

Change-Id: Iade0c3ecab1c6d6a0b8c3ab7381c60975393d9a1