To Backport the N-Mr1 Changes

To Backport the N-Mr1 Changes

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

Change-Id: I7ff8442f627deb70400ad84a8712c27dffdbcda1
CRs-Fixed: 1099457
tree: 2211f3742f423259c27a3d85c84896404051cc85
  1. service/
  2. tests/