Reconcile with gingerbread-release

Change-Id: I15b4935e88d1cf7bb2bab4245a2fe306d38fd7c6