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

Change-Id: I6cae641f41a95b5367f74e945b9b8e5222fef72e