Fixing Flow Audit and corresponding test case.

Change-Id: I36329871e5aa24587c96c0c10a10f6b5a2e5c35e
Merge "Fixing Flow Audit and corresponding test case."