Merge "Revert "Revert "mako: disable WiFi roaming""" into jb-mr1-dev