Merge "Fix log matching unit test bug"