Update Echo to master

Change-Id: I09e717280739d8443ff9e2f4c542f2073e661d5a