Merge "Added junit for policy client impl"