Merge "Bug Fix: SIM Status will display the proper network type" into lmp-mr1-dev