Merge from gingerbread

Change-Id: Ifb3d42aa0f3772ca545f739df347eeb0ca7f58dd