Merge "sensors: fix concurrent modification exception" into oc-dev