Update Echo and Thanks to master

Change-Id: I30cd5b92deb4e8c00b8d9c1f581fdadd834fc4cc