Update Echo to master

Change-Id: Iec2092ba5473805afaadaba11990f0411aa7ddc0