Update Echo to master

Change-Id: I7e271a7ec14eec849c6d1b465d42ee049e2ce4f6