Merge "mako: mms: initial overlay version for mms_config.xml" into jb-mr1-dev