Merge "Fix issue 3499926."