No functional change intended. MFC after: 1 week (cherry picked from commit a3b460d499a995eaf5a79d1b84e22b0d4eda8f2a)