Merge "Update strings when shortString is true" into oc-mr1-dev