Update Echo to master

Change-Id: I886110bb3e356d41530ed7c67d4c5082c4468443