Merge from gingerbread

Change-Id: I31e3da083b642d5c7cf6332095fa228b840ee7bb