Merge 1261232c6b9dcf0ec858b6f87701ea4833869dc7 on remote branch

Change-Id: Ibda814618f3f6343f02aca2e27f44a46ee0ea903
tree: 109ee2dfb93b608371508b4dfd9799fea2ed07d9
  1. generic/
  2. qva/
  3. SEPolicy.mk