Update notes for submitted changes

* Backport 369302 from branches/1.8