Merge "Fix issue 2876124." into gingerbread