Merge "Fix SIM issue for Sprint users" into du44

Change-Id: I9d9e2f13ce859d91ac3e2d73d1d95a76e99c4719