Merge "improve sensorservice_test output"