Merge b695e943f45de1d720338d36977caa5c15f1c400 on remote branch

Change-Id: I75206553d3b55957c84121e7b163dc650705533d
tree: 71df39deef0b78f3e2286fe3b513e8c7500db028
  1. generic/
  2. legacy/
  3. qva/
  4. SEPolicy.mk