Reconcile with gingerbread-release

Change-Id: I74130bf01f70959376b8453e0288c4436cdbec2b