Merge "Use raw string when setting wifi preference title." into oc-mr1-dev am: 8c3ce8d60b
am: 523eb32dd0  -s ours

Change-Id: I2ba03f0b44cf4315c98fc30d3b487b26dff854dc