Merge "Removed code duplication in PolicyClient"