Mass merge from gingerbread - do not merge

Change-Id: I308b961fecc19c50b05bbf988180d492321489b7