Merge 9021b7aa45dbcc735a2b0f1f07663462c9e64ad4 on remote branch

Change-Id: Ic4f02565d4f1076b6c08272c8a816fac4f2895ad
tree: e1111805c6e4f9691b8d59441f65d80ed469adc6
  1. generic/
  2. legacy/
  3. qva/
  4. SEPolicy.mk