Merge "Fix issues in sensor target test"