Mass merge from gingerbread - do not merge

Change-Id: I98a715e440817a46ab85c7213985542f48f0c12b