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

Change-Id: I6c9bf1761d2a1244fb53cd3df016fd58d1a20099