Merge "Work on issue #28689719: Runtime restart" into nyc-dev am: 77ad5f1657
am: ebfbc39537
* commit 'ebfbc3953719b00a51450c3002cb2d26cfa0289d':
Change-Id: Ib46312139e77f68dd8eeef5d90586d79ecaead17
This commit is contained in: