[Runtime] Add minor improvements

Change-Id: I70016abeada3ad154d49e812539bc248de493605
2 files changed