Merge "OPP: Fix opp file receiver issue" into q-keystone-qcom-dev