Fix more of issue #28689719: Runtime restart

Change-Id: I0cce1cef884cf1508f1e726ea3439a5ffee84993
1 file changed