Reconcile with gingerbread-release gingerbread-mr4-release

Change-Id: Ibcd6e2299e3f03df1a5320041404a42a20546a57