Update Echo to master

Change-Id: I916264dd21addcbc0fdbeb835a7a4de61e493f57