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

Change-Id: I1ad0a6ab2a9c61ddc69095621bb080d4110cec09