Merge "Fix password unlock method" into lmp-dev