Update Echo to master

Change-Id: I128dcfba49c3c1791757ea41852b7b23d8cbb668