Merge "unstarted_runtime: Add additional cutouts"