Merge "esoc: Fix user space corruption due to wrong data type" into msm-4.9