am b282cc30: am 3bde026a: am afb6b50e: Merge "DO NOT MERGE: Don\'t log passwords returned from vdc" into lmp-dev

* commit 'b282cc308f13a464c7e2455e5b2b67c622ffce30':
  DO NOT MERGE: Don't log passwords returned from vdc