am 05ade73e: Merge "Ensure that setting an empty password clears it" into lmp-dev

* commit '05ade73e580b826ead839d3c5db508a8ea25ad93':
  Ensure that setting an empty password clears it