Merge from gingerbread

Change-Id: I4a71e1392d781243dbd0814fedc7cd598c8e156d