Merge "Use non-logging compat framework calls" into sc-dev