Merge "Fix unchecked size in ISensorServer code"