Merge "Add new strings for b/63109928" into oc-mr1-dev