Update notes for submitted changes

* jflte: Fix merge failures