Merge "Fix TitlePermissionTest failures due to test leakage"