am 010ab3bd: am e5fc4071: Merge "Return proper result code after creating...
am 010ab3bd: am e5fc4071: Merge "Return proper result code after creating pin/password lock" into jb-mr2-dev
* commit '010ab3bd':
Return proper result code after creating pin/password lock