Update Echo to master

Change-Id: Ia1fe5c9b0c0b748c407bf3d0336b317f46b50bfb