Merge "Revert "Make sure that const-class linkage is preserved, try again.""