Merge 280bc9beec58bd4db022b64e66261e5597330a1a on remote branch

Change-Id: I4f46bb3911f5569b1431591bbd7c45e8010bf4b4
tree: 3219c4984e250870e49df3fa0bd4147d3eb912bd
  1. generic/
  2. legacy/
  3. qva/
  4. SEPolicy.mk