am 8f61e754: Merge "Unable to unlock SIM with a PIN/PUK" into lmp-mr1-dev

* commit '8f61e7549ebb7ccb6bc2d41c30a9f2da2fb9bd7c':
  Unable to unlock SIM with a PIN/PUK