Update notes for submitted changes

* Revert "Squashed commit of the following AOSP/master changes"