Merge "String tweak for vendor logging dev setting" into rvc-dev