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

Change-Id: Ieb5b3590e42d99c59592812afdbf9b22c8779fe9