Merge 0712e62cd252eed7605b87f211156ebcd29f73f3 on remote branch

Change-Id: I663d75a05b42705e69591b3b7c2d2ce8bc4b99d8
tree: 9f918935b3ced4ae7024b07d8f90d3212321930e
  1. generic/
  2. qva/
  3. SEPolicy.mk