Merge from gingerbread

Change-Id: If6c009d62eb4b2ed931d3e5082d08ad996aca689