Merge "liblog: cleanup TODOs in tests"