Address trivial logging concerns

Change-Id: I45db76bbefefbc192faa6eb90ef2c8a95a448995