Merge "Base: Fix logging_test"