Merge "Remove @Overridable annotation from CHANGE_LIMIT_PRIORITY_SCOPE" into main