Merge "Prevent errors when updating operator pref summary" into r-keystone-qcom-dev