Merge "ObjPtr<>-ify UnstartedRuntime, fix 2 stale reference uses." am: aaebb1468c
am: 9113b2650a

Change-Id: I3636e33ec5aca0f6431050bd313d8e11cc5a2e34