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

Change-Id: I030819e192190aff8d935f0cd0df18c4e631f2b4