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

* commit 'd07347eddb85fc8838071fa68c9e324eb1ae8384':
  be more robust with handling unknown sensors