Merge "Ensure that setting an empty password clears it" into lmp-dev