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

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