flow: updates

Change-Id: Iab99ea5a03248f6de98f6c3c820961a7ebed4701