Merge from gingerbread

Change-Id: I017330e0232b317b8bb54e19ab05874b18c83246