gerrit: qualify vars

Change-Id: Ib984be37dad7ba7405c44142e7593785eb75fc34
Merge "gerrit: qualify vars" into production