Merge 101a7249a5bfdf8b402ac9d4035e9d312f667a58 on remote branch

Change-Id: I0511ec91420840eb6b7e755c04bbd28229eeb8e9
tree: c3b4b6c185c4844d075c27ac77d4bf35b527f6a5
  1. generic/
  2. qva/
  3. SEPolicy.mk