Mass merge from gingerbread - do not merge

Change-Id: I9111f11e0f85577b96556a5f996bf81b4f997de9