Merge 1b9b6aaebe02853185176776eead8a088170d9ab on remote branch

Change-Id: Ica6d1094c47d6aced9f3d8fa1851d092660d2ff0
tree: 4efba69d9bab8b3aa14e22b15f3d87032f62f015
  1. generic/
  2. qva/
  3. SEPolicy.mk