Merge "Work around for use-after-free cert bug"