Update Echo to master

Change-Id: I2496a3f663ef070b8290b1d3819ffdd4a56ba754