Update notes for submitted changes

* Fix AOSP build - DO NOT MERGE