Merge "Map: Add support for MAP 1.4" into q-keystone-qcom-dev