Update Echo and Thanks to master

Change-Id: I428092ebc8157aa955c3e68ebc4b86ffcf291986