Flow key changes

Change-Id: Ied672d0fcd7d3e56fb4ff08e67780aa8dc43e107
Merge "Flow key changes"