Update Echo and Flow

Change-Id: I611c1328bd93e3bc5c7e053d30532a14e0593607