Merge cf2b4aabd0a6ffbda7699e9387c012ceb99fcd11 on remote branch

Change-Id: I8b1f4573be15fd79fba52fed47eabe97b65aa6fe
tree: 564af79cc13361557e7653d6ca0044e8185364af
  1. generic/
  2. qva/
  3. SEPolicy.mk