Merge "Fix issue 3157123."