Merge from gingerbread

Change-Id: Icfc2bb041b1360a8a0258d7de5547fded86bf7ec