Update Echo to master

Change-Id: I5194c81065b273c13549ff0a3bd5205d18dbc55a