Update Echo to master

Change-Id: I36dad636caeb6a6f8cce05bccb853aae2bf8463c