Update Flow with backported bug 58455 backport

Bug: 58455
Change-Id: Icf9cb51b4437cae18aea8c314aa7865f60243394