Merge 02950739e3602a76f464dfc27ac5deb2b2bd2ddc on remote branch

Change-Id: I918f7a3eeff334cd4b5363e91aec41cadcbbd390
tree: 31408d15e9076242dd294d156e1d3ad34594cc00
  1. generic/
  2. legacy/
  3. qva/
  4. SEPolicy.mk