Reconcile with gingerbread-release

Change-Id: I6cdfd6015906695c20b6249783d32ccf2e322acd