Merge from gingerbread

Change-Id: I7c675656cd203ebf2b3adc9396bc84f76495a6ed