Update Flow with three backports

Change-Id: I5ff194d5dfa91e3376f979cc9178be58709ba4b8