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

Change-Id: I4cfbf1d9924e3574054ba26567f3b959e657f35e