Merge "Fixed VTS failure in no SIM case" into pi-dev