Reduce IAD usage by 50%

At provider's request.

Change-Id: I976eaff357bf0ad4bce2a7fd5fe6fd81750276c5
Merge "Reduce IAD usage by 50%"