am 7ef3867c: am 8174f131: am 14df567b: am 4883a6b2: Merge "Label adspd socket and allow access." into lmp-dev

* commit '7ef3867ca10bf8a61c935ae35dc01b0d20dff3d9':