Merge "do not merge - Fix issue 3371096." into gingerbread