Merge "Add String Resources for SIP Settings" into nyc-mr1-dev