Mass merge from gingerbread - do not merge

Change-Id: I283edea7175253ff92e8d8d66c4182606baf42bf