Update Echo to master

Change-Id: Ic5175f043f6d2ced45f69d963c580269986f8c84