Update Echo to master

Change-Id: I3109eac5fbff28275d7bbeca515499a389cfe427