Merge "[Sensor][Bugfix]: Remove redundant assignment operations"