Merge 52840fed8de512be2a8fe1ef8199896580f8ae72 on remote branch

Change-Id: Ied8cb421102e90bd414497ec75253188dec1bc11
tree: f016d0fadad115cfce27936de1689e798d2de8f3
  1. qcwcn/
  2. wcnss-service/