Merge 881189d79681143a260f3a9218006c6a80def81f on remote branch

Change-Id: I3fab1994fc0986a93b495176f3f78d697c28f4c3
tree: b1cc564617fb97ec19fb6a85a0da03446b4801c3
  1. qcwcn/
  2. wcnss-service/