am c7579101: (-s ours) am 202ab298: am b282cc30: am 3bde026a: am afb6b50e: Merge "DO NOT MERGE: Don\'t log passwords returned from vdc" into lmp-dev

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