Merge "Fix issue 3192794."