Update Echo to master

Change-Id: I29cab6dfc845c716722d09b42fb10437816e5b8c