Update Echo to master

Change-Id: I8028ffceb439850fe958df251fc7d92bdb96ab4d