Merge from gingerbread

Change-Id: I874374c7c0a05f4159e1a77142d95eb62f7eac61