Merge "Marks testSecurityLoggingWithSingleUser as flaky." into tm-dev