Fix SIM issue for Sprint users

Change-Id: I88fb052e0daeac16aeec19bc546e36c2830bda39
Merge "Fix SIM issue for Sprint users" into du44