Update Echo to master

Change-Id: Icc17c02cec893210f66b81fae08a86a7d4c30af2