Merge "Revert "Revert "Revert "Revert "Revert "Make sure that const-class linkage is preserved.""""""
am: 8fb28dcf0e

Change-Id: Icf47b0bb6c44331d892239069ffee1988e0731f5