Mass merge from gingerbread - do not merge

Change-Id: I38bb9cc71b7b04cb3c71aa06561ed64c3b6a2ce4