Merge c896d85c from gingerbread

Change-Id: Ib739e79187ec95fdbb88f90f3d03fafd4a1f721a