Merge "Policy API JUnit Tests"