Mass merge from gingerbread - do not merge

Change-Id: I619ebf3b2f01b93d20ff45ce8ff7decf150e54d6