Reconcile with gingerbread-release gingerbread-mr4-release

Change-Id: I0f44d27ec2e8b99f45ee059d78cae7cceb41931e