Merge "mako: remove overlay related to tether_apndata" into jb-mr2-dev