am 604cfc2d: Merge "Enhance pin/puk support" into klp-dev

* commit '604cfc2de963c17ed53fef745b93e3afcfd5a5f8':
  Enhance pin/puk support