cleanup policy parsing a bit more

Change-Id: Ia7053557411e085a58c7904b12a9d07dd2d1ccf6
Merge "cleanup policy parsing a bit more" into feature/ec