Update Echo to master

Change-Id: Ifc4b01c4c20e99aa4c9b14ab86c213ec5f723786