am 4483f461: am bb241c3c: am 4eb2e04f: Merge "Use CURRENT_OR_SELF when checking SPEAK_PASSWORD setting" into lmp-mr1-dev

* commit '4483f4611ee002b57f851aa3268ff610023c72c5':
  Use CURRENT_OR_SELF when checking SPEAK_PASSWORD setting