Retain forward/reverse flow semantics if flow is already present

Change-Id: I713711760516ab9e04a3e82084e7ed7a6d0cc28d
Merge "Retain forward/reverse flow semantics if flow is already present" into R1.06