Merge "Add some strings that will be needed for QS changes" into oc-dev