Update Flow with bug 71054 backport

Change-Id: I3e098e465a1caf4052553533a6e0ca48d0ff7266