am 4b398eaf: am 49159a12: am b0426c0c: am c71d6382: Merge "Move adspd into enforcing." into lmp-dev

* commit '4b398eaf4e920cba375c102d3df80a6f996944ee':