QA: Updates for incremental changes

This brings the builds back to green(*) but nothing else

* Pending bz ticket 71318 fix

Change-Id: I77d97cceb425aa20f802501a10851fc4f5ed7859