Merge "Fix issue 3371096." into honeycomb