Merge "Revert "Add a policy version."" into jb-mr2-dev