Merge "Fix issue 3098880." into gingerbread