Merge "Fix issue 3305305." into gingerbread