Merge 6d1aa565b893b707a59f5c91d0d4438b69fdbf62 on remote branch

Change-Id: Idd95e04af10a4e7d72a8d46b1ef604c291851d99
tree: 0334dfc6b5eb757d4d94290f44ab892154ad6a69
  1. qcwcn/
  2. wcnss-service/