Merge "Added unit test for PolicyException.java"