Merge "refactored Log statements to Slog" into pi-dev