Merge from gingerbread

Change-Id: I6b895012db6b96666dc3257b1f2e430925981188