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