Update notes for submitted changes

* cherry pick sg-id fix : 40d47a8e86 and b26fb5ec62