Merge from gingerbread

Change-Id: I1181904c75e3adf014a0b2690bda7cfd49bd64a6