Merge 8569f71b88fafd7061f120677e0bf446e4fc5ce1 on remote branch

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