Commit 1dc601b04a816a5b5ed12ae1c01ddcfd60a8398f

Behdad Esfahbod 2018-10-03T17:27:46

[os2] Minor rename/shuffle