[automerger skipped] Merge "Delay eval to save memory use in...
[automerger skipped] Merge "Delay eval to save memory use in create-suite-dependencies" into pi-dev am: 6536add2 -s ours
am: 148369f6 -s ours
Change-Id: I50aa9fe3bb5ac215315662cb5ee171ff3e7bde97