Update Echo to master

Change-Id: I48387e038e0c7d02038d5249e300097544b74e85