Merge "revert 14387672, modify Logging test to be async" into sc-dev