Merge 9021b7aa45dbcc735a2b0f1f07663462c9e64ad4 on remote branch

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