Merge "Fix issue 3354692." into honeycomb