merge from gingerbread

Change-Id: Icee740e130b9ebd21446de79b63435f5d1d046e4