Reconcile with gingerbread-release

Change-Id: I263d6dc1a018056aa306854b9832ae0c49546db2