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