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

* commit '8174f131c8da43db31f769ccad364b27f7679d10':