Merge "Fix issue 3302649." into gingerbread