Merge 5777a16d1b5ed5e1a9c29ca8bbdb20c7875a2fd2 on remote branch

Change-Id: I013231257dda64fd6f4bf106448ef25895283817
tree: fc1e4b65a2e55bdfd729a22782691ca73b1f9805
  1. generic/
  2. qva/
  3. SEPolicy.mk