Update Echo and Thanks to master

Change-Id: I9f00c72aa98687185a099a3241186b452f7e6935