Merge "Resolve usage of hidden logging APIs"