Merge from gingerbread - do not merge

Change-Id: Iba2f457ca4e8ea90078d1028e1ea829b3d889285