Merge "Rename entitlement callback to adhere to API guidelines."