Merge "Fix issue 2952766." into gingerbread