merge from gingerbread

Change-Id: I12d6ef65986db41e658bf8d476a8e18c4dd89917