Merge "make testdrive log message less verbose"