Mass merge from gingerbread - do not merge

Change-Id: Ic0d8c51f6373169b514a8ff2681d8cf36c92abd6