Reconcile with gingerbread-mr4-release

Change-Id: Ib13d4ae0889290a35357da01bf3acf140b89bd23