Merge changes from topic "am-35e3def5-5e20-4bba-9df4-a9c97f6a12f2" into q-keystone-qcom-dev

* changes:
  [automerger] SAP: Fix Potential NPE while creating SAP service record. am: 21db543328
  SAP: Fix Potential NPE while creating SAP service record.