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

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