Merge d005e860158a21b62e7a81b2ce41c720069a5c73 on remote branch

Change-Id: I6c68c31bc3bd3af4307d5fb6c25b001f603c287d
tree: f02677ac6b9f24f6132f7d28a56c7e1306355819
  1. qcwcn/
  2. wcnss-service/