Merge "Make sure that const-class linkage is preserved, try again."
am: 9036914553

Change-Id: I28498fa06cfcb2a75ce7f87fc60d5ea0f63ef193