Update Echo to master

Change-Id: Ic00d87d880b253aceec2ec0b3125267f92238573