Update Echo and Thanks to master

Change-Id: I1f8fc18bf1842a9d9a87629bf782e4094ac03af6