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

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