Both of these modules are doc(hidden) and commented "Not public API", but incorrect downstream code sometimes still references them. Naming the module __private will make it more likely to be noticed in code review.
This picks up changes from a135199ab1 and 1b35c9e27e.
a135199ab1
1b35c9e27e