Merge from gingerbread

Change-Id: I85fd33e5db2744f78166b3d879e9e664a06653e3