Cosmetic changes in Data Flow and commands

Change-Id: I6ba54a96ae637ac85cb2f62c96c22caf506fa643
Merge "Cosmetic changes in Data Flow and commands"