Revert "Fix M Issue on configurable policy engine version."

This reverts commit 01ce6a4f342b09da48414dbef49293e0107cc66e.

Change-Id: I3f8f8a78ef68fa071faf422693c941c40e5e2ac2
7 files changed