Merge b249409124fbba9384bc461c55a62169a41ee9c9 on remote branch

Change-Id: I66c2acebd6f4615ea8b8c7244fed1b11b5703ed8
tree: c6f709242a407c031409a637b15f2fcf509ed910
  1. generic/
  2. qva/
  3. SEPolicy.mk