Fix some strings

Bug: 26411749
Bug: 27022727
Change-Id: I405ba61a46011365bfa2aebfdb0797738237e86b
2 files changed