Merge "mako: overlay to mobile_dun feature" into jb-mr1-dev