Merge from gingerbread
Merge from gingerbread

Change-Id: I2eb7136a1bf5aa57b1a2c28de71aa4dd7fce178d