Merge "Fix bug 3061769" into gingerbread