Update Echo and Flow

Change-Id: I91e982773ff0d63b5dd33bc1236c016d76533545