Merge "Tidy logging code not using UNIMPLEMENTED."