Mass merge from gingerbread - do not merge

Change-Id: Ic87ee08c780c42ef469a2120eb358afaabeeb1b1