Fix strings

Bug: 7182012
Bug: 7071211
Change-Id: I34aa508d5e4151ffdc538a3ab9ae1ddf3749b345
2 files changed