Update Echo to master

Change-Id: Ia666f1ead4a4f26ff42892894284eed9f088b66b