Merge "Fix issue 3371080" into honeycomb