Merge "Refactor Access Rules APIs"