Merge "Make sure that const-class linkage is preserved."
am: 9ee5fdf92f

Change-Id: I8afb9b99379656a8206b3bfed565a887189fbf16