String updates

Bug: 8453182
Bug: 8453136
Bug: 8453089
Bug: 8453086
Change-Id: I50a7c90c67f84a4814afa5ec75086b42409587c4
1 file changed