Mass merge from gingerbread - do not merge

Change-Id: Ie3a334d6d190164a4207dfbbdf035c906bf43742