Merge "Policy api documentation updates"