Update Echo to master

Change-Id: I53492b3ec247a16727ee2525164de4bf55c528ba