Merge 3a519f781abd4e5b6cff14a5c7c201252198da70 on remote branch

Change-Id: Iafd7e917eb1d8ee13145ca305f4e77afc151a783
tree: b789db2bb089f2a3173b8a48cbb616677b6231df
  1. qcwcn/
  2. wcnss-service/