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

Change-Id: I105171194bc9ea807955b0b7251096d905b89c62