Merge from gingerbread

Change-Id: Id0509272ef8382fb0004f4d38bbba744e3487a8c