Reconcile with gingerbread-release gingerbread-mr4-release

Change-Id: I4ef90a9d38940c8484c030056157a99a103f6aa9