Fix runtest commit for non-default modes

Change-Id: Id155187881ee65496bc393a7ef2c7a4ca4dec030
Merge "Fix runtest commit for non-default modes"