Consistency tweak: Wrap variable names into <code></code>

Followup to Ia6efdf931b0b6be7556fc16c040aa7493845cdfc

Change-Id: I51eea3de9adb0be6695ef6ff18059d536dce801b
Merge "Consistency tweak: Wrap variable names into <code></code>"