Merge "Tighten sensor expectations"