am a973eaea: am b5b67779: Merge change I7fa8c508 into eclair-mr2

Merge commit 'a973eaea4597d819671c5caab8feed442e9a1af5'

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