Update Echo and Flow

Change-Id: I73980e5dddc29e3cd65b0a4a41971f364853b96d