Merge "Check for permission when displaying AutofilLServices." into oc-dev