Merge 7fdcba7f6fed1ee2fc93e1c26efceb832f3c3a8d on remote branch

Change-Id: I6d91e0fe384dbd4a3760df30e5c41c6a06d6f006
tree: 4c755f4a73b8c294aef3df91b0c0485b4ae7bd43
  1. qcwcn/
  2. wcnss-service/