Ensure we pickup requirenevrs as well

Change-Id: I0a64e4b4b700f316d0635f8721a6656e8eb9898a
Merge "Ensure we pickup requirenevrs as well"