Merge "Revert "Fix `symbol not found` error for hidden apis used by MTS""