Update Echo to master

Change-Id: Ife5a1929c58ab6d20e99142d642ad33711b1748d