Keeping double quotes just in case single quote escaping is different

Change-Id: Iab90563f46fd56df741c7617b25f12b6b39913cf
Merge "Keeping double quotes just in case single quote escaping is different" into production