Update Flow with three backports

Change-Id: Icf36c495489faaf028b8179a899d3a0f57e28771