Just in case escapes are different with single vs double quotes, I'm leaving this as it was before.

Change-Id: Ice1913b8ef34f8d0a1e268d796660b0b723b8892
Merge "Just in case escapes are different with single vs double quotes, I'm leaving this as it was before." into production