Merge "SAP: Fix Potential NPE while creating SAP service record." into p-keystone-qcom