Update Flow for cherry-pick of Ib9aa3a6c

Change-Id: I2f2c74c460d117057d3df746df87bf097b6f81d3
Merge "Update Flow for cherry-pick of Ib9aa3a6c" into wmf/1.24wmf20