Update Echo to master

Change-Id: I7c9e7da1417a3030314ec74ef0eacd503d2513b3