Mass merge from gingerbread - do not merge

Change-Id: Idbfeda9c0a9720d894352747c01754ed2c90c44d