Merge 41fdaeb72cd3551220fa756ff034c43daf7c1aa0 on remote branch

Change-Id: Id23026b1b9719c9bb422bbba38ed1670fa47c0da
tree: 363f4ac4d86dac5d6531a7a64d333b894047f61d
  1. generic/
  2. qva/
  3. SEPolicy.mk