1ac57433a2
Forcing dynamic includes for inventory-based conditionals results in incomplete execution. Change-Id: I81607054f78291d3290463cf238817c4d81c11a7