am 15efc135: Merge "Tighten sensor expectations"

* commit '15efc13513d75f90c74f5eaa1a322504ff5957dc':
  Tighten sensor expectations