Merge "Remove String8(StaticLinkage) references." am: 19b9aad80d am: 553896d8e7 am: 584e8003c1

Change-Id: I20ac9137909a48a91ebe9399359b84203df6172c