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

Change-Id: Ia6f85d2561707bbc7e1d1fe0ddc54712adf471b5