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

* commit '5250db0bfd18aacbb6406212a84e3dd101e547e6':
  Fix 6507787: fix MMI PUK unlock procedure