Update Echo to master

Change-Id: I8f4103a8e5d8c3b7caa975cdf51f601446d9b81b