Update strings and character limits for some new strings

Bug: 6243599
Bug: 6247318
Change-Id: Iaab4f6a2b55b7ee18804a3dcf8a0d00e67627e57
2 files changed