Sync with r331585.