Merge "MAP: Fix below issues of MAP 1.4" into q-keystone-qcom-dev