Merge "Update logging util to not crash on null" into pi-dev