Merge 37c48b61c93430f037b63f5d97ff30672c0a8ae7 on remote branch

Change-Id: I72dfde9bbdaa4fc025df1aad76095b041a5e5405
tree: 00c329de0faa857fd823e5f70d032db1fec3bdd2
  1. generic/
  2. qva/
  3. SEPolicy.mk