Update Echo to master

Change-Id: I779d30826d9669083b91fc72b9042f1fb1f8c9ee