Reconcile with gingerbread-release gingerbread-mr4-release

Change-Id: Ib4073e5060f6e9981a31ad5671a21bd930f403f4