Merge 7e0b5d1f1ecfda0230d68c1c203b0d03e5058936 on remote branch

Change-Id: I5c1baa3bb9d9682f57ee856c8f775070a4ffb6ac
tree: 371ea232fee825a3b18ffd5b0771be835c625a9b
  1. generic/
  2. legacy/
  3. qva/
  4. SEPolicy.mk