Merge "Enhanced Attribute protocol support" into r-keystone-qcom-dev