Merge from gingerbread

Change-Id: I595b03d9a91c7a9e58b0789b2cbbacdaa2f961e9