Update Echo to master

Change-Id: Ib787af2adc1824c3320623425f6d3c51c9c981bd