Merge "Revert "Revert "be more robust with handling unknown sensors"""