Merge "Fix bug 3058324" into gingerbread