Merge "Permission support for diagnostics."