Merge "Fix issue 3317627." into honeycomb