Mass merge from gingerbread - do not merge

Change-Id: I760dad6c380c43e11684470a68e15604c25dcf2e