Update Echo and Flow

Change-Id: I6324d40ec2fe8ea589e969592b5020242cce8d33