am bb241c3c: am 4eb2e04f: Merge "Use CURRENT_OR_SELF when checking...
am bb241c3c: am 4eb2e04f: Merge "Use CURRENT_OR_SELF when checking SPEAK_PASSWORD setting" into lmp-mr1-dev
* commit 'bb241c3c':
Use CURRENT_OR_SELF when checking SPEAK_PASSWORD setting