Update Echo to master

Change-Id: Ida319e001a8744a336b1a5c8374f9cac2568227c