Reconcile with gingerbread-mr2-release

Change-Id: I98de118c52ed658a448c2e885a481eece75257a3