Update Echo to master

Change-Id: I2c7662adbc90b2827c54c7779cbc1691256f5fd6