am ba8be2ff: Merge "Update Sensor tests so they can always pass." into lmp-dev

* commit 'ba8be2ffd90af05cbc882a52e54db6a7bf5acc7c':
  Update Sensor tests so they can always pass.