Update Echo to master

Change-Id: I51d067ccb30297a482c7579b5c54d2435481cfcf