Update Echo to master

Change-Id: I7fb631792b9fe248be79a8b9ba8c76012f0a833c