Merge "Attempt to fix presubmit failure"