Fixing some logging changes.

These were made on rvc-dev, but in the CP to master (ag/11643151)
these got dropped due to merge conflicts.

Test: TH
Bug: 153609812
Change-Id: I2e3e4580e9101a8ad1894b90858290c7e2a5c535