Merge e2bab9e235234c41d8df8168ffdc56417408754f on remote branch

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