Update Echo to master

Change-Id: Ie1d7bd71fba90b2f70beef8257420c9b2fac9880