Make add run_list a separate function

Change-Id: Ib4c2b58e8966c1988c0ff59053ced836a75fd363