Merge 4c51ec65fa03ab594c0dee10f73ccc200d95205d on remote branch

Change-Id: Id467c25c366332683013fed3b1a1f902455e06bd
tree: 19547810289acd2cba835303e359a80ccdaf7ade
  1. qcwcn/
  2. wcnss-service/