am 83485dc9: Merge "be more robust with handling unknown sensors"

* commit '83485dc920cdc4a6f3dd6797623f536c99f08a6c':
  be more robust with handling unknown sensors