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

Change-Id: I0f40f8d3bd84f2b070c7d1bd99b46fb4ac08d971