Merge "Tweak strings for assist app" into rvc-dev