Merge 7b20c17c36aead202f3dee78dbd72f9590fc234b on remote branch

Change-Id: I24f1fd51ddf79684a57f6647497029530f7feeca
tree: 5ee7058c233967f74d5dfa8fe12f9bf6d6caf845
  1. generic/
  2. qva/
  3. SEPolicy.mk