Update Echo to master

Change-Id: Ie57a0233ea099d2d8a94f36b2a5d529978d23bae