Merge "Fix issue 3159946."