update string

Change-Id: I1a219c78fab99e3e7872a9489c26868be4627e23
update string (2)

Change-Id: I177d55843553fa3940831802ba7e5910bb16aeba
Merge branch 'temp' into cr-main-10.2
update strings

Change-Id: I1e8ab4b383e802d6915c6d1f8d3be77563bc8090
update

Change-Id: I001a8aa5d6e9594e767cc4054f9d2a3c393badf7
update String and fix conflict

Change-Id: I599c990e008895db84b8ff664428aff599b839e3