Merge 41d3d59345845198dd24c5d04257f80aa26799b6 on remote branch

Change-Id: Icb47ccd81f27fed3600805c873345ba34e28c46c
tree: 1a5e71bfed800d039653218a55f3f57252f7b87e
  1. generic/
  2. qva/
  3. SEPolicy.mk