Merge "Adding more policy-api junits"