Update Echo and Thanks to master

Change-Id: Ie76d66497535a3f35bbecb24a6b83db0ffc83ccf