Merge "Fix issue 3425342."