Update Echo to master

Change-Id: Ieee8018af0720f5627a477cb7dbf1dc3ec1352e3