Merge "Fix issue 3225810."