Mass merge from gingerbread - do not merge

Change-Id: I99b09f1fd58b5c3119903304605ff613e1c4a665