Merge "fix SIM related VTS failures" into tm-dev