Mass merge from gingerbread - do not merge

Change-Id: I90e4c75d1f4833a5c639de6b4a78bb6cb2e8233d