merge from gingerbread

Change-Id: Id43a6262c3f5cffc37db77748f129acb9c841823