Merge "Correct sensor handle for operation parameter" into oc-dev am: 8bba03d323
am: aab57c5f21

Change-Id: I7485ab70fccd80056258701b2fdc3b12173c5b29