Merge "Fixes related to ACL service."