Mass merge from gingerbread - do not merge

Change-Id: I105c2c728aef42629dbb44af8e3d1044c4ae1e97