Update Echo and Thanks to master

Change-Id: I4b63734404476c048977035fc13e8c3aa993c383