Merge 1c3565b809aa47a2d8270a82651de41de26502df on remote branch

Change-Id: I2b17d370b415df7e3f0b2beec3073caf160f1579
tree: aaaaef6010354af986b8f7c047fd60a178278037
  1. qcwcn/
  2. wcnss-service/