Merge c609ec6efde099ade8d03f1f89522dfcf4d6dc19 on remote branch

Change-Id: I97126ab0ed2e311be3492be6e0d1c3ca64a7879e
tree: 57faa5a07a2f6dd90eaf6102dcdf7145044301b9
  1. generic/
  2. legacy/
  3. qva/
  4. SEPolicy.mk