Merge "Check for null sensor in SensorParameterRangeTest" into oc-dev
am: 979ff43e87

Change-Id: I4d9613dcc7a36eaff17f32ff19bf121534add1ec