Update Echo to master

Change-Id: Ieb816dd298e9981e3c3a08a833f2498b7bf46fc8