Merge 56e53b0085162cc470c4144ee13dccc34613fff5 on remote branch

Change-Id: Ied747823a21cd479d094b11786d69186318bf27a
tree: 5605db3e68082bbc441207d1f41d42fcbd937d31
  1. generic/
  2. qva/
  3. SEPolicy.mk