Merge "String updates" into rvc-dev am: 159538d35a am: e929e69810 am: 18d11571a9 am: 296025b6db
Change-Id: If1e9bae914ee4e18098a9bbd8157f1532598b51f
This commit is contained in: