Merge "soc: qcom: Avoid possible buffer overflow in service-locator" into msm-4.9