Merge remote-tracking branch 'origin/wlan-aosp.lnx.2.0-rel' into wlan-aosp.lnx.2.0-dev

Backport from rel to dev branch.

Change-Id: I16ec112b4ddd94ec5e4b235f7d580d77bd59f002
CRs-Fixed: 1111541
tree: 3d7a552a5fa55ffdbc9bf3d8e627db18baf2d6da
  1. service/
  2. tests/