Update Flow with backported bug 65051 fix

Change-Id: Iaa71ac1a695cf7bd2c8c81326a4080bed24c0824