am b06be57f: Merge "Fix 6507787: fix MMI PUK unlock procedure" into jb-dev

* commit 'b06be57f0acf8bb7b8c1767604058c8f061a7b8b':
  Fix 6507787: fix MMI PUK unlock procedure