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

Change-Id: Id89770140b8cac1ec746aff6a9c1fd4049449254