Merge commit 'a973eaea4597d819671c5caab8feed442e9a1af5' * commit 'a973eaea4597d819671c5caab8feed442e9a1af5': make erase-password-on-SIM-change optional
Merge commit 'a973eaea4597d819671c5caab8feed442e9a1af5' * commit 'a973eaea4597d819671c5caab8feed442e9a1af5': make erase-password-on-SIM-change optional