Update Echo to master

Change-Id: If75f2a4649b74a1cdb913970a8f5d4bb22ce9220