Merge "BT: Refactored Config.java file" into q-keystone-qcom-dev