Update notes for submitted changes

* Merge branch 'ics' into jellybean