Reconcile with gingerbread-mr4-release

Change-Id: Ib35a01f42fec2638707a34469b3a8187560a91f9