Reconcile with gingerbread-release

Change-Id: I5c0a9a54ce30b6e56e8df431ff89556c231890e1