Merge "Return proper result code after creating pin/password lock" into jb-mr2-dev