merge from gingerbread

Change-Id: I05a6bed8b7275114ce545a7a45f2e13bf5469ec0