Merge "Override gtest timeout and add logging"