Reconcile with gingerbread-mr4-release

Change-Id: Ie476582431135ba95f6d04d0321493c7c4cb7530