Merge 6f4a63a2e4d6bd83de032230662a45f28af76e7c on remote branch

Change-Id: I9672eade49d97cdff9de92bc2c43e94258615b4c
tree: bf445f95d3c2abba671b4bc3f8f4c6b6ba61f289
  1. generic/
  2. qva/
  3. SEPolicy.mk