Mass merge from gingerbread - do not merge

Change-Id: I2de05cde768f91d3e6911421bb8b59d7e8b9b9df