Mass merge from gingerbread - do not merge

Change-Id: I2693f4f400c0c56df04ccb571bfd3420c6f0d697