Merge "mako: Updates to the prima wlan driver runtime configuration" into jb-mr1-dev