Update Echo to master

Change-Id: I71d79fe1e2ac33205a0ed870afe2773f8d2d30aa