Deploy SWAT backport for flow

Change-Id: I8ca385263baf45a6f5ef1e0bf4624874150b400c