Update Echo to master

Change-Id: Ib07d140de5fac008531c6b8693d37cf6eb343d4c