Merge "String updates" into rvc-dev am: 159538d35a am: 9559e7d480 am: 2c59efa1b9 am: 415f8b549f am: bc0a31a331
Change-Id: I2b2fc15413074484a854aafabb23aa3a959a5dfa
This commit is contained in: