Work in progress run-parts replacement.

Change-Id: Ie95b3ed2145594b5f6436454a6756012fc1c4729