Merge "Improve revoking access to content providers."