Merge fcc9adbef3253d6e57bd1f51af079b36c6c89803 on remote branch

Change-Id: I0d64e0a9cb3bc7897ca3e9f0eefe22bb1d46d5d3
tree: eb27452c361ddc0cff8a27bec63e6c43cd11ea6a
  1. qcwcn/
  2. wcnss-service/