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

Change-Id: I35bc7708c546eadb6acc0bd5e87cadb81b38b846