Update Echo to master

Change-Id: I98fdc6957f58a137dd4ec40d87f9ced3a8030b9a