Merge "MAP: Fix Format issue with v1.3 device." into q-keystone-qcom-dev