Merge commit '243e16a' into master_merge

Change-Id: I62b789bbc2515a7d835ab65768d006ecbccaf449
tree: b5f4663f9080ee25413c88a2351f969ceedd823e
  1. qcwcn/