Merge \"Add String Resources for SIP Settings\" into nyc-mr1-dev
am: 29e765fca8

Change-Id: I13396c67d5febe0b921d7620ef0cb3a4b1d8b18b