Merge "Disable historical permission usage collection"