Update Echo to master

Change-Id: I52253ccda771716a7af8d5180d29477d8d408bd5