Reconcile with gingerbread-release

Change-Id: I8fca2ef3fff1802d532c0aea27d16f6a58e725c4