Use double quotes where dereferencing is needed

Change-Id: Ie976790a3c753e8049e0a7ce3b7f46c487dd949f