Mass merge from gingerbread - do not merge

Change-Id: I6ebabc61e585e5a04292f1f049511c4c1cd91a87