Merge 6f68a803eb018b9aa8639e4c98be9c61121f9ef0 on remote branch

Change-Id: I6dea49853525da383085cce2826bf5a5e2372249
tree: e299175734c7b4296774351ef337be99bac0114b
  1. generic/
  2. legacy/
  3. qva/
  4. SEPolicy.mk