Merge "Bug#1025106: Phone crash in non-system-user mode after user input PUK code."