Update Echo to master

Change-Id: I77ea1eef71208c4200fc49373c76a5613ed2b317