Merge "Work around C11 const atomic restrictions."