Merge 3bdddf83fdd4d171caaf0deab0b72f2b1fc3591d on remote branch

Change-Id: I54cef5d211f72e8074f0f2ae0e9be378dcf4c431
tree: 46d6bf01d0e6b2892c1aef963576972d12342092
  1. generic/
  2. legacy/
  3. qva/
  4. SEPolicy.mk