Update notes for submitted changes

* Squashed commit of the following AOSP/master changes