Merge from gingerbread - do not merge

Change-Id: I3529a5f85d93e66aa5fca62ac44c242c4f7e163d