Reconcile with gingerbread-release

Change-Id: Iadd016b3b119f2a286055443e14f68860b182537