Style changes in policies and commands

Change-Id: I74142da1c20b18acf5dd0a5618f84dcf6671e5f3
Merge "Style changes in policies and commands"