Update Echo and Thanks to master

Change-Id: I187884bbe47aae736f0510a23ce54ef848e1272d