Mass merge from gingerbread - do not merge

Change-Id: I54e4538e801d7f82688d52f5fd36588d8b85ff2c