Reconcile with gingerbread-release

Change-Id: I8e511e60b49a5046ca8262ed6a1fc1550dc92841