Merge from gingerbread - do not merge

Change-Id: I07cba4438a0e54384e27dd4b3593f58314474bd1