Merge "Sim name doesn't persist on reboot" into lmp-mr1-dev