Merge "MAP: Fix get msg listing issue" into q-keystone-qcom-dev