Merge "Fix instance boot when metadata exists"