update Echo to master

Change-Id: I6cff906e224d5f24be501255109859b948396f68