Merge "Revert "Fixed VTS failure in no SIM case"" into pi-dev am: b471863b21
am: a97a348163

Change-Id: Id8d9c0a2b4c64a3dc522ad236fd466cfc703b7f6